resolved conflicts to pullrequest #387
Merge pull request #445 from Diullei/master

resolved conflicts to pullrequest #387