Merge pull request #122 from TomasKorbar/v1.x