Commit fixes #34