minor improvements
Merge pull request #1 from szelcsanyi/master

minor improvements