different fixed and features
.
Merge pull request #1 from Luxo42/master

different fixed and features