fixes on callbacl for endpointcal
Merge branch 'release/0.0.2'