Added -idAndTitle option

See feature request #16
Merge branch 'idAndTitle'
Updated version
Added a surrounding div

Fix feature request #17