Updates to code
Merge branch 'master' of https://github.com/Carla-de-Beer/Processing