commit 20
Merge pull request #3 from stbyrne/work

commit 20