Fix #41
Merge remote-tracking branch 'jbowen/develop' into develop