Dan Yu push
Merge pull request #3 from mikeebert/dan_yu_branch

Dan Yu push