fixed #2: feature2
fixes #2.1: first bugfix
Merge remote-tracking branch 'jgg/feature2' into jp