fix
Merge pull request #333 from ffrensch/master

fix