Fixed link bug caused by incomplete proxy (fixes #57)
Added nowrap to var names
Released 0.8.7
Merge remote-tracking branch 'upstream/master'