Refactoring
Merge branch 'dev' of github.com:getmelisted/trawler into dev