Merge branch 'master' of https://github.com/ewancoder/eal into notebook