Fix for #68
Merge pull request #75 from gjb2048/master_#68

Fix for #68