corrections
Merge remote-tracking branch 'upstream/master'
Merge pull request #27 from jefBinomed/master

merge