Merge branch "unknown" from "deleted repository" into master

Fixes #27 and closes #28