Resolved Issue #18, #19

Resolved Issue #18, #19