add story
Merge branch 'master' into andreamoruno_issue_12
Updates and pagination
Merge branch 'master' into andreamoruno_issue_12
updates
Merge pull request #25 from jgenso/andreamoruno_issue_12

Andreamoruno issue fix #8