Fixed a commit issue,
Merge remote-tracking branch 'Github/master'
Added a class method to create a map.
Changed the names of some files, and the names of some classes.