Fixed issue #113
Fixed issue #114
Fixed issue #115