refactor
Merge pull request #72 from ryn0/master

refactor