Merge branch 'master' of https://github.com/lordareonz/hyperdrive.git