CR TP
Merge pull request #49 from nicodaniel/master

CR TP