changes as discussed in disc code
disc changes as discussed
Merge branch 'master' of https://github.com/PascalSteger/darcoda