Impoved code (new parser and some little changes)