fix 1/2
Merge branch 'master' of github:ThijsSmolders/wwwcie_playground_2