Merge pull request #115 from debian-pi/master

Making sure v1.0.x and master are equal