seven commit
Merge pull request #7 from GanisEnder/branch2

seven commit