Updated the documentation
Merge pull request #6 from wick-ed/master

reviewed diff