Merge pull request #16 from claudius108/master

Small administrative changes
Updated the logging function.