some changes for logging using slf4j
minor changes
Merge remote-tracking branch 'origin/master'