Reviewed-on: http://git.kundeng.us/phoenix/labyrinth/pulls/4
Reviewed-on: http://git.kundeng.us/phoenix/labyrinth/pulls/2