Adding tests!
Fixing issue with template nullifying
Merge pull request #6 from Belelros/master

Some changes