my original check-in
Merge https://github.com/derekmadej/derekgithub1