Added a bunch of features and cleaned up code
Added a bunch of features and cleaned up code
Merge branch 'master' of github.com:MattVitelli/Pixar-Sample