Small updates and corrections.
Merge pull request #7 from Ekkehardt/master

Small updates and corrections.