Merge pull request #19 from migocorp/master

Merge it into Master