#24 , #25 , #28, #27, #30  issue fixed