Issues #37 & #40