Resolve issue #21
Resolve issue #22