Fixes #41 And Multipage