Merge pull request #16 from TinyAllen/develop

Merge from Develop branch