Merge pull request #241 from hunner/add_unsup