resolved conflicts to pullrequest #387