Stop overlay overflowing the containing element - fixes #48
Merge branch 'issue/#48'