Merge pull request #71 from stevendgonzales/master

fixes to last pull
Merge remote-tracking branch 'upstream/master'
update unit tests for changes made in code