Fixes issue #225
Merge pull request #226 from modalstudios/master

Fixes issue #225