Minor bug fixes
Remove unnecessary print
Merge remote-tracking branch 'upstream/master' into dev

Sync up
Merge pull request #19 from johnb30/dev

Fix some minor errors and remove print statement.