Fixed shadowing warning (issue #36)
Fixed template instantiation warning (issue #35)