Finishing touches
Merge pull request #5 from akaashanky/master

Finishing touches