Refactoring
Merge branch 'reborn' of github.com:JulienBernard/DoctorJ into reborn