More toying in contfun and Icon.fs
gMerge branch 'master' of github.com:Jegp/BPRD2013