Fix for #112, possibly
Merge pull request #113 from bbozo/fix_112

Fix for #112, possibly