Final touches
Merge pull request #7 from arjungopisetty/master

Final touches