jluu feature 1
Merge pull request #13 from githubteacher/jluu1

jluu feature 1