Working on master
Merge branch 'master' of github.com:ManuelOverdijk/ncc