pushing up latest for work on parfunc
merge of local changes into master
merge of local changes into master