Merge pull request #274 from Psy-Virus/develop

Addition to last pull request #269