refactoring
Merge branch 'master' of github.com:ChristopheBelpaire/jewel_of_the_oracle