Merge pull request #22 from SmartmaticLabs/master