some improvements
Merge pull request #3 from paweln1986/dev

some improvements