minor improvements: returns, logging, de locale
Merge pull request #2 from ivoba/master

MINOR: improvements