Merge pull request #4 from fntlnz/develop

Logging improvements and initial tests