first steps
Merge branches 'master' and 'erick'