did more mapping
Merge pull request #68 from PJTNT11/master

did more mapping