Resolved issues #15 and #18