Merge pull request #18 from tpokorra/master

merge several smaller fixes