fix comma, bump version
merge master