More Fixes
Merge pull request #19 from mauricio-gamboa/feature/mgamboa/2014-06-18/more-fixes

More Fixes