Reviewed-on: http://git.kundeng.us/phoenix/mear/pulls/63
Reviewed-on: http://git.kundeng.us/phoenix/mear/pulls/62