Fixes #6 Adds sort support
Merge branch 'develop' of github.com:necrophonic/test-mock-mango into develop