Pulled in latest from the master, and re-added "clear" functionality

Code refreshed with current master branch, and re-added all the code
needed to implment the "clear color" feature