Fish support

Finishes the works started by on @alanbbr on #67.

@pwaller: do you want to make a quick review before I merge it into master ?