Issue 8 followup

Fixes issues discussed after merging of #18

@NikolausDemmel