Minor edits, fixed some bugs
Merge pull request #42 from pachecod/master

Copy Edits