commit by gui
Merge pull request #2 from roden0/develop

commit by gui