Shadows added
Merge branch 'lukasz'