Merge pull request #2 from brhoads/master

Update master and prep for merge