Merge pull request #4 from trickybit/develop

Initial development