refactored
Merge pull request #27 from mpath/refactor

refactored