Reverted back to old code with logging
Merge pull request #41 from tomdepplito/remove_commenting

Reverted back to old code with logging