fixed api issues
Merge branch 'paul' into devbranch