Leonardo2718 Merge pull request #35 from leejingbo/devel