Overwriting with Andrei's delta
Merge branch 'master' of https://github.com/jfluth/porcupineApple