Need to strip both
Merge branch 'master' of github.com:farleyknight/hijack into patch-1