Fixed #007
Merge branch 'master' of github.com:giftbox/helloworld