Merge pull request #1 from CTMM-TraIT/master

update
Merge pull request #5 from ptdeboer/master

Merge pull request #1 from CTMM-TraIT/master