fixed
Merge pull request #33 from nastysloper/refactor

fixed