Merge pull request #5 from parkjohnston/andrew-work

Andrew work
Merge pull request #8 from parkjohnston/andrew-work

Andrew work