pull stunt
Merge branch 'dev' of github.com:ksami/one-shot into dev