ENH: Adding function conj
Fixing typos
Merge pull request #125 from Dapid/add_conj

Adding function conj (still failing some tests, but will apply fixes later on)