MAL-131 | done
Merge pull request #110 from redlable/master

MAL-131 | done