fixed #23
conflict resolved