Add helper functions for Area and Comp
Merge branch 'master' into opengl
Clean up OpenGL code