Fix #12: bookmarks is optional
Prepare v0.3.1
Merge branch 'master' into debian
New upstream release