Merge pull request #1 from ghostrong/dev

testing pull request