Merge pull request #18 from sharanagrawal/master

final changes