Major Update
see https://github.com/Caple/Bolt/commit/4b7dc98ce3c09a03dd72f0f618ddc9372f86f295