refactoring
refactoring
Merge pull request #1 from mbergerm/master

refactoring