fixed #13
fixed merge conflicts