Merge pull request #69 from piofthings/master