minor improvements
Merge pull request #1 from ivoba/master

minor improvements