1170 Partial #1
Partial #2
1170
Merge pull request #2 from mauricio-gamboa/feature/mgamboa/2014-11-17/1170

Feature/mgamboa/2014 11 17/1170