Issues and Features - Done
Merge pull request #11 from oscmejia/new/bugs-and-features-done

Issues and Features - Done