Merge branch 'master' of github.com:Hi-king/interval_shot