Updated to the 2.0.0 standard.
Merge pull request #3 from roadster31/refact

Updated to the 2.0.0 standard.