Resolved issue #112 and #115