.
Merge branch 'master' into dan
.
Merge pull request #20 from domestic/dan

Dan