some fixes
Merge pull request #17 from pfefferle/master

some fixes