Working on API again
Merge remote-tracking branch 'origin/master' into DB_Security
Merged master into this branch, fixing errors