Removed logging
Merge branch 'master' into python2