merge pr 103