1.2 modify
Merge pull request #6 from raviosc/developer0123

1.2 modify