Merge remote-tracking branch 'upstream/master'
Merge pull request #28 from pnewman1/master

fix failing unit tests