Commit fixes #31