Merge pull request #21 from sharanagrawal/master

Final(hopefully)