Rewrite
Merge pull request #142 from thenoodle68/develop

Fix cypher