Merge branch 'master' of https://github.com/thunderenlight/sample_app