Refactored to 2.0.0 standards
Merge pull request #5 from roadster31/refact

Refactored to 2.0.0 standards