Fixed #111, #112, #113, #114, #115