started adding cap api
Merged remote master to local