changes..from a long time ago.. T___T
Merge branch 'master' of https://github.com/mqngo/Jaelle