merge fix

Ref #62