Merge conflict
Merge branch 'master' of github.com:mariowise/bigdata
New update