Add: issue#20 and issue#21