Merge branch 'patch_#85'

Let's see if someone complains...