Initial working commit.
Merge pull request #1 from Tamini/develop

Initial working commit.