* Use slf4j instead of JDK logger
Merge remote-tracking branch 'origin/master'