Issue CROSSDATA-109 fixed
Merge branch 'future/0.1.0' of https://github.com/Stratio/crossdata into future/0.1.0