minor fixes, added pagination
Merge pull request #15 from ToreyStapleton/master

minor fixes, added pagination