Merge pull request #85 from wz1000/master