Improved documentation

This is for #246