moved status call to API
Merge branch 'master' into HEAD