Merge pull request #458 from adrianschmutzler/fixcommit