Master Commit

Signed-off-by: GalenEvil <galenevil.eve@gmail.com>