Merge pull request #87 from floralvikings/develop

Merge in changes to master.