Fix issue #114

@claywilkinson please merge.