Merge pull request #26 from TRex22/develop

Develop
Merge pull request #28 from TRex22/master

Merge pull request #26 from TRex22/develop