First Commit.
Some Bugs fix.