Merge pull request #136 from sn0opy/master

added more missing templates + fixes
and another missing file
Merge pull request #137 from sn0opy/master

and another missing file