Pull request

Need the most up to date stuffs!