general refactor
Merge pull request #9 from buddhamagnet/master

General refactor