Updated to normalize 1.1.0 and 2.1.0 and some missing parts.
Updated versions (2.1.0/1.1.0)
Merge pull request #11 from brandonm/master

Updated to normalize 2.1.0/1.1.0