Merge pull request #96 from jnicolson/master