Issues : #164, #169, #174, #175, #177, #178