Solving issuee #8

close #8 finally, I guess