Merge branch 'master' of https://github.com/szeregnyi/sample.git