Add SLF4J and log4J + bug fix