Merge pull request #2 from gillestasse/master

refactoring
Merge pull request #2 from baendasamtok/master

Merge pull request #2 from gillestasse/master