part1 complete
Merge pull request #2 from mlnorman/master

part1 complete