fixed #38
conflict resolved