Merge pull request #650 from Xyverz/master