Merge pull request #108 from tarsius/master

Better fix for #107