Commit fixes #21