Merge pull request #4 from andrinux1992/master

pull from master
Merge branch 'test' of github.com:andrinux1992/helloworld