refactoring
Merge pull request #3 from mpetris/master

refactoring