Merge pull request #82 from reneschuster/1.3.x