Initial commit
Some minor change