Merged with git://github.com/ajwood/N3.git, closes #1