Added Pasnau reference
More on Trojan Horse; corrected spelling
Fixed merge conflict