Merge pull request #108 from abeaumont/master