Merge pull request #1 from PaulStoffregen/master

resync