Adding support of SortedSet and SortedMap interfaces.
Merge pull request #45 from jad7/FromUp2

Adding support of SortedSet and SortedMap interfaces.
Merge branch 'upstream/master'