fixed problem with ' in pic titles; fixes #7, fixes #187
Merge branch 'stable'