Merge pull request #31 from abeaumont/master