Merge pull request #290 from smirfolio/master

Fix bug MK-176