Merge pull request #2 from spikey360/master

again pull :)
embedded to template
cleanup comments

who likes comments anyways :)
Merge pull request #6 from arthasdk/master

well?