Issues #10 , #12 , #16 , #18