adding mine to my feature before pulling jo's from master...
getting closer
Merge pull request #17 from rgschneider/jon-feature

Jon feature