Merge pull request #287 from manekovskiy/patch-1