Work in Progress and Bug fixes
Merge branch 'master' of https://github.com/KodeSeeker/CodeSnippets
Long time merge