propagated some missing changes and made a few improvements
Merge pull request #4 from klaeufer/master

propagated some missing changes and made a few improvements