Switched to logging with Winston
Added missing semicolon
Merged master
Added Winston require