added a bit logging and fixed enum bug
Merge remote-tracking branch 'origin/master'