Making changes following #101 thanks @jgladch