Shelter flat

Hi Marco,

I hope this pull request is ok...