private -> protected (extendable)
Merge branch 'master' of github.com:JVMartin/angel