Merge pull request #479 from dev-0x7C6/master