maintenance
Merge branch 'master' of https://github.com/theopak/glassface
ready for testing