Merge pull request #19 from sharanagrawal/master

Some changes