solves #2 and solves #3 + fixed the some name variables.
Addressing pull request comments.
Merge pull request #4 from antgonza/issue_2_3

solves #2 and solves #3 + fixed the some name variables.