Maestral's changes.

Since we didn't have write permissions on the original repository, we made a fork and pushed our changes to it. This is a pull request for those changes.