Merge pull request #10 from jampekka/dev

Prettier but dog slow MP listing