Merge pull request #15 from sharanagrawal/master

other changes