Fix compile on linux gcc 3.7.2. Change the name of the template parameter to avoid name clash
Merge pull request #4 from mmalcolm/master

Fix compile on linux gcc 3.7.2. Change the name of the template paramete...