Merged Updated Patches from pawitp to lp
Merge pull request #4 from Jackeagle/lp

Merged Updated Patches from pawitp