test
develop
test
test
Merge pull request #2 from yangong/feature/20130128_test

Feature/20130128 test