Fix and Update

I just clean up my local branch and re-commit my fixes again.  I am more a bitbucket user rather than github, please let me know if I miss anything.

Happy coding :+1: 

T.L