Cleanup

Merged brgerhar requested to merge cleanup into devel

Closes #38

Edited by Ghost User

Merge request reports