Issue #10 & #11