Feature/cleanup

Merged Emmanuel Promayon requested to merge feature/cleanup into develop

Closes #29

Edited by Emmanuel Promayon

Merge request reports