nii236 Merge pull request #2 from AlexDunmow/patch-1 …