Pr 100

Issue #221 & #100 .