fixes
Merge pull request #40 from mauricio-gamboa/feature/mgamboa/2014-10-21/magic

fixes