Fix for #114
Merge pull request #119 from tjakobsen/feature_neo4j_2_0

Fix for #114