organising the code
Merge pull request #9 from kouvelas/master

progress commit