Merge pull request #236 from Tigerfell/master