Merge pull request #61 from ffrensch/master

fix