Performance upgrade, fixed: #11 , #6 , #10 , part. fixed #8