Resolved issue #37 and #38
Resolved issue #37 and #38