Nick O: Updated to latest version of thundr