Changes from Nov 12, 2013
Merge branch 'master' of https://github.com/acfloyd/Curveball