Fix for #73
Merge pull request #80 from grafjo/patch-14

Fix for #73