Merge pull request #3 from rossnanop/master

Final proposal changes
First changes