Merge pull request #25 from jefBinomed/master

merge
last one for Jeff
Merge pull request #26 from kelle62819/master

last one for Jeff
corrections
Merge remote-tracking branch 'upstream/master'