Fix AttributeError: 'unicode' object has no attribute 'more'.  Closes #466
Merge remote branch 'upstream/master'