Fixing a bunch of issues and making things better
Merge pull request #12 from gholtslander-va/patch2

Fixing a bunch of issues and making things better