Added better support for template namespace
Release v0.1.22