Revert "Revert "Features/short list""
Merge pull request #219 from SCPR/revert-218-revert-217-features/short-list

Revert "Revert "Features/short list""