Indentation of code, pre-check before starting logging and refactoring
of test class.
Merge pull request #1 from wryel/master

Indentation of code, pre-check before starting logging and refactoring