resolved conflicts to pullrequest #442
Merge pull request #451 from Diullei/master

resolved conflicts to pullrequest #442