dkahle Merge pull request #237 from dkahle/master