Merge pull request #572 from delirium---/master