fixed
Merge pull request #355 from ffrensch/master

fixed