Merge pull request #5 from arjundevane/master

Final revision