Update master branch with latest from stable

GitHub didn't offer the option to merge #3 into master (only stable), so this brings master up to date.