Fixes #13
Fixes #19. Also added text about Cypher box