update
Merge branch 'master' of github.com:hacktea8/q_v_o_d_p_2_p