commit 21
Merge pull request #4 from stbyrne/work

commit 21