commit 24
Merge pull request #7 from stbyrne/work

commit 24