Merge pull request #147 from dbcfoxes2014/paginate_and_small_tweaks

Paginate and small tweaks
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into paginate_and_small_tweaks