merge issues

ref #42