Can we please get these minor fixes into v1.0.17 prior to v2.0.0 #24

Closed canihavethisone closed 5 years ago