Merge pull request #1 from gabi2/master

start refactoring