Updated

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>
Merge branch 'master' of github.com:bwhite/openglass