Added simple SL4J logging
Fixed merge