Merge pull request #298 from IIIF/bug-fixes

Bug fixes
Merge pull request #299 from IIIF/bug-fixes

fixes #294
Merge pull request #301 from IIIF/bug-fixes

fixes #295
updated index
merge with master