Merged again.

Signed-off-by: commandersatisfied <huppel31@hotmail.com>
Merged 3

Signed-off-by: commandersatisfied <huppel31@hotmail.com>