Fix for #144
Merge pull request #145 from armed/patch-1

Fix for #144