transformed html side closes #13
fixed merge conflict