Initial commit
Fixed logging