Batov HW
runtime + fixing
Merge pull request #30 from Batov/master

Runtime + template