Fix #7 from maintenance branch

Also simplifying README