Changes to sync with melamid

Closes #35