Merge pull request #2 from BioBoost/master

fetching latest updates from bioboost master
Merge pull request #10 from brechtberteloot/master

Merge pull request #2 from BioBoost/master