Fixed typos and follow new formats
Merge pull request #9 from deviprsd21/master

mmm