And also the API project.
Merge pull request #338 from alxdarksage/develop

And also the API project.