initial
V2.6
Merged last github version