some change
Merge pull request #1 from Hawstein/dev

some change