Updated for 4.2.2
Merge branch 'master' of github.com:marakana/alpha