updated documentation
Merge pull request #128 from wick-ed/master

reviewed diff