Updated type mapping for some values in ClassesBuilder (rearranged them according to documentation)
Merge pull request #13 from SimonSimCity/master

Updated type mapping for some values in ClassesBuilder