Merge pull request #31 from michaelpeternell/master

some bugfixes...