Merge pull request #269 from Akfreak/patch-3