Fixed #134, #27, Amélioration #132