fixed problems, updated to work
Merge pull request #2 from teharrison/master

fixed problems, updated to work