Merge pull request #85 from EdLoach/master