changed information
Merge pull request #13 from bucketzxm/master

changed information