Fix for #122 and #123
Merge pull request #125 from tjakobsen/feature_neo4j_2_0

Fix for #122 and #123