merge issue changes

Ref #62