Merge pull request #41 from exfm/rhapsody

Rhapsody
up limit to 10 from 5
Merge branch 'dev' into rhapsody