Merge pull request #20 from wmalik/docfix