Resolved Issue #18 & #19