cleanup
implemented sort-context feature
new version