mmajewsk Merge pull request #1 from GLuft3/patch-1