Added #7 and rewrited bugs.