API 2-1-1, 2-1-5, 2-2-4, 2-3-4, 3-1-7
Merge branch 'master' of github.com:buaayz/SAD