Updated to latest version

The first of many commits like this I'm sure.