Fix #24 thanks @mauricecruz @wkerswell