Correcting some issues.
Merge pull request #82 from ArcBees/brandon-update

Correcting some issues.