merging assembler's changes

Author manavortex <manavortex@gmail.com>
Author date 2018-02-16 08:21:33
Author local date 2018-02-16 09:21:33 +0100
Committer manavortex <manavortex@gmail.com>
Committer date 2018-02-16 08:21:33
Committer local date 2018-02-16 09:21:33 +0100
Commit 3f51d94375f644198ffdac7ed7164d266db0bb17
Tree d51ecd873bdc95885fad553b46644829e297255e
Parent a39d52bc7e53195a2316f08873a3a246a9c1b827
merging assembler's changes