Fixed #52, #53, #54, #55 et #56