Pull request

Some updates