Refactor & Simplification
Merge pull request #12 from adatoo/master

Refactor & Simplification