updated several things
Merge branch 'develop' of https://github.com/ThomasFournet/4AJ into develop