Port github tickets tweak from changinglives. Closes #155.