Updating PR#115 according to mle suggestions