Merge pull request #1 from gkze/master

Refactoring
WIP
Final draft of the working copy