refactoring
Merge pull request #4 from patriot1burke/master

refactoring