GitLab

Passing unit tests and doctests and ready to be merged into release branch. Please have a look and merge when you are happy with it!