Created two HashMaps to eliminate the need for two switch statements.
Merge pull request #1 from JohnMcCall/master

Created two HashMaps to eliminate the need for two switch statements.