Merge pull request #3 from YetiHQ/develop

Initial import