realdjpardis Merge pull request #28 from rismakov/changes