Merge pull request #19 from josemazo/master

Pull-request for start using the 'develop' branch in the original repo
Minor changes to see what happen with the tests
Changes in the query builder for the treatment of the scopes. By now, we make it manually.