Merge pull request #2 from banrui/master

From_bando_20140407
modified constants