Bugs
Merge pull request #12 from mauricio-gamboa/feature/mgamboa/2014-08-29/bugs

Bugs