Fixing API
Merge branch 'master' of github.com:ami-lab/AmI-Platform