Updated to use Python logging module
Merge branch 'logging' into development