refactor
Merge pull request #66 from ryn0/master

refactor