Added some improvements
Merge pull request #2 from kiberStender/5.2_1

Added some improvements