Fix #611; also swap print statements out for loggers
Merge pull request #622 from Atheros1/master

Fix #611; also swap print statements out for loggers