Merge pull request #1 from serby/master

Adding context to log output and time only timestamp option
Better test name