Incorporated feedback for #40, fixes #40