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

Revert "Features/short list"