Merge pull request #10 from gawrysz/master

various cosmetical changes