Fixed issue #38 and #40 and probably fixed #41