Resolved issue #17
Resolved issues #15 and #18