Merge pull request #49 from johnb30/master

Logging options.
Fixing logging.
Merge remote-tracking branch 'upstream/master'