Merge pull request #26 from kelle62819/master

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

merge