refactored API control
Merge branch 'master' into controllers
Merge pull request #17 from elyotli/controllers

Controllers