Changes
Merge pull request #50 from mauricio-gamboa/feature/mgamboa/2014-11-11/fixes

Changes