Resolve issue #26
Resolve issue #27