Commit fixes #33