Merge pull request #125 from joellundell/develop

Fixed issue 61 - doesn't load more search results
general fixes and issues related to PR #124 and #125. Also adds code refactoring