Restoring pull request

(sorry, wanted to delete my own branch)