Merge pull request #25 from TinyAllen/develop

merge develop