[1650] Mako implemented, ready to rewiev.
Merge pull request #6 from Exorades/bug_1650

[1650] Mako implemented, ready to rewiev.