Merge pull request #1 from sfhatcompany/develop

v0.2 Upate fork repository