Updated Src to include changes from Tyrone.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>