Some small bugfixes
Merge branch 'bleeding'
Merge pull request #32 from svkampen/master

Merge bleeding with master to stop github complaining.