simplified and renamed strategy
Merge branch 'master' of github.com:jwerle/pineapple