Issues #15 , #13 , #12 , #3