fixed
Merge pull request #324 from ffrensch/master

fixed