Made changes to address #72