Fix NullPointerException #11
Add Logger