Updating to the latest versions

It's time to update this skeleton with the latest versions and do some
modifications. Here goes!