Merge pull request #1803 from Azaezel/chasingElsey