some fix
Merge pull request #526 from ffrensch/master

some fix