Resolve issue #23
Resolve issue #24