Merge pull request #105 from conal/master

Relax type of buildDictionaryT
Experimental bugfix for unshadow.
Merge branch 'master', remote-tracking branch 'upstream/master'