Fix for #67 as discussed
Merge pull request #70 from nalbion/master

Fix for #67 as discussed