Merge pull request #94 from mamarley/ssloidentdfix