First joint version
little fix
fix
Merge pull request #5 from pitcorr/master

First joint version