Merge pull request #1 from sfhatcompany/develop

v0.2 Upate fork repository
Merge pull request #17 from jordanwink201/develop

Merge pull request #1 from sfhatcompany/develop