please marge my code

1st Commit