Merge pull request #40 from RonPasquarelli/master

resync with mainline