Updated Lighting and drawing
Merge branch 'master' of git://github.com/Danny987/ZamZams