Fix for #112
Merge pull request #113 from nithril/master

Fix for #112