some corrections proposed, hopefully for good :-)
follow-up corrections
Merge pull request #3 from ingdir/master

Friday night commits arrive in 3...2...1... w00t!