Fixed some copy-paste and type errors.
Merge pull request #1 from ukretschmer/master

Fixed some copy-paste and type errors.