commit 23
Merge pull request #6 from stbyrne/work

commit 23