Merge pull request #1 from rfrank/master

resync master from rfrank:master