Improve documentation and Fixes #8