- merge upstream
- fixes #92 NEEDS DATABASE-UPDATE