Merge branch 'master' of https://github.com/q3trm/sample-code-