refactorting
Merge branch 'master' of https://github.com/dfurstein/FPBL