some fix
Merge pull request #527 from ffrensch/master

some fix