Merge pull request #1 from neo4j/master

update