Merge pull request #2 from brhoads/master

Update master and prep for merge
Merge pull request #6 from pmosbach/master

Merge pull request #2 from brhoads/master