Fixes #6
Fixes #1
fixed merge conflict
Merge pull request #10 from seth-marquez/biespana_stmarqu1

Fixes #6 Fixes #1 Fixes #3