Merge pull request #8 from dygcao/program

Program
Merge branch 'master' into program