GitLab

Fixes for issues #27 (closed), #28 (closed), #29 (closed), #30 (closed), #31 (closed), #32 (closed) and #33 (closed)