Minor fixes after rebase.
Merge pull request #63 from NationalMuseumofDenmark/master

Minor fixes after rebase.