Patch related to #301
Merge pull request #307 from Psy-Virus/develop

Patch related to #301