fresh import of 0.1.18 (with JSON support)