commit 22
Merge pull request #5 from stbyrne/work

commit 22