morning work
Merge pull request #16 from cbyn/chris

morning work