Issue 70

this should fix #70. see last commit message for a description of a unit test that is now failing. i suggest merging this and then modifying the text to be less sensitive to changes in text descriptions.