Merge pull request #9 from badeleux/master

reorganization
Merge remote-tracking branch 'origin/master'