more flexible template and corresponding unittest
corrected binary operators
Merge pull request #1 from HaraldZealot/master

more flexible template and corresponding unittest