Also added some function in fredvanl-feature1 branch
Aaargghhhh