Fixes #105 (and more)
rebased onto 66011e1d188728172d9edc204b7d1aa5ac58c1ad
rebased onto be4c5e5011c0adc04189fbb00433e7e75e13fce1
Almost two weeks have passed without negative comments. I self-merge this now.
Pull-Request has been merged by oturpe
Fixes #105
(and more)