Merge pull request #112 from floralvikings/develop

Develop
Merge pull request #113 from floralvikings/master

Merge pull request #112 from floralvikings/develop