Complete fix for #106
Update to fix for #106
Complete fix for #106 (2)
Merge pull request #133 from dsyme/fix106

Complete fix for #106