RedPill Rev1.36

Signed-off-by: sarcastillo <sar.castillo@gmail.com>