Merge pull request #20 from GuKKDevel/bug-1305