Merge pull request #27 from TinyAllen/develop

merge from develop