Removing the double-wrapping of object-tools
Merging pull request #5: Minor templating fix