Added a surrounding div

Fix feature request #17
Merge branch 'div'
Updated version