:+1: closes #40