Dev v2 added. minor bug fixed