Proper handling of extra arguments
Add doc as submodule