Merge Dasein upstream into TWC

Closes #66