Merge pull request #8 from massyl/master

toward more modular design :-)