Merge pull request #1 from sigsegvat/master

some minor changes :-)