Marvin is a sad cow
Merge pull request #39 from vibro/fixes

Marvin is a sad cow