Merge pull request #2 from angularity/refactor

Merge Refactor branch
Merge branch 'master' into refactor

* master: