Final Cleanup and Completed
Merge pull request #1 from b91961/master

Final Cleanup and Completed