Commit fixes #32