minor changes in a few places
Merge remote-tracking branch 'upstream/master' into minor
Remove print statements
One last time
Merge pull request #56 from johnb30/minor

Minor