merge issues

ref #62