General Fixes
Merge pull request #18 from mauricio-gamboa/feature/mgamboa/2014-06-18/general-fixes

General Fixes