Merge pull request #1 from mikulucky/master

Changes