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

1170