Code cleanup & Re-Write. Removed unneeded items
Merge remote-tracking branch 'origin/master'