Pull request for #95

Made changes to the implementation