Commit fixes #19