Template functions update and mark.
A more effective function mark.
Merge pull request #60 from Queequeg92/master

Template functions update and mark.