Upgraded doubleshot and updated outline but something is freezing
Merge branch 'master' into dev/upgrade.doubleshot
Release 0.2.2