bugs fixed..
Merge pull request #430 from naturwerk/minor-bugs

bugs fixed..