Merge pull request #20 from sharanagrawal/master

Some changes