Merge pull request #232 from Tigerfell/master