Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_api/pulls/267
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_api/pulls/263