Adapted to new storage and draw instrument
Merge branch 'master' of https://github.com/cklokmose/IINotebookBackend