Merge pull request #86 from wz1000/master