Merge pull request #179 from amikheychik/master

Code-style fixes
Inventory unit added to the templates