Added level geometry
Merge branch 'dev'