phase 4
Merge pull request #1 from jmmk/feature

phase 4