Fix bug #114
Merge branch 'duncanspumpkin-master'