Merge branch 'master' into v1
model_name setter
Merge branch 'v1'
Merge pull request #6 from goncalvesjoao/master

gem update