April 17 V2
Merge branch 'master' of https://github.com/erboyle/Squeeze