Fixed issue #40
Fixed issue #43
Fixed issue #18
Fixed issues #36 y parte de #21
Fixed #33 and #21