Code Reveiw
Merge pull request #1 from aespaldi/master

Code Reveiw