some improvements
Merge pull request #1 from sslavian812/master

some improvements