Implement API
Fix merging conflicts
Merge branch 'dev' of github.com:CruGlobal/sp into dev