Set context on the wrapper
Tweaks
Merge branch 'master' of github.com:kmalakoff/knockback
Tweaks