Bugs and Features Done
Merge pull request #10 from oscmejia/new/bugs-and-features-done

Bugs and Features Done