Merge pull request #308 from LightGuard/master

Resolves #271