Issue #11 & #12