@Stofkn's changes for the Neo4j-v2.0.0-M05 version as discussed via email and skype