housekeeping
major housekeeping
Merge branch 'master' of github.com:michelgrootjans/CanI