all that + some conflic fix
Merge pull request #33 from vladpupaza/radu.moldovan/Comments

Better templates + coding style -> all that + some conflict fix