Merge remote-tracking branch 'upstream/master'
corrected program
Merge remote-tracking branch 'upstream/master'
Merge pull request #32 from bzfoltho/master

corrected solution