Merge pull request #165 from crazy2be/glass

Glass
Merge branch 'master' into terrain-generator