Merge branch 'master' of github.com:beeva-pablovaliente/properties-generator