Updated to latest version

Just wanted to test how forking and merging works, thought i might as well update this in the process.