Merge pull request #9 from seth-marquez/biespana_stmarqu1

Fixes #4
fixes #5
fixes #8
fixes #2, fixes #3
Merge pull request #11 from seth-marquez/crmcdona-ajmurill

fixes #5 #8 #2 #3
fixed merge conflict