Merge pull request #3 from niekversteege/master

Equalize
CLI Progress
Merge pull request #5 from niekversteege/develop-niels

CLI Progress
Merge pull request #6 from niekversteege/develop

Develop