Updates and fixes with Alejandro in airpair session.
Using with in template. Added comments in go code. airpair with Alejandro.
Removed unrequired comment.
Merge pull request #2 from GeertJohan/master

changes made in airpair session with GeertJohan.