Merge pull request #26 from TRex22/develop

Develop