much changes
Merge pull request #1 from xerpi/master

much changes