Merge pull request #87 from floralvikings/develop

Develop
Merge pull request #88 from floralvikings/master

Merge pull request #87 from floralvikings/develop