Bug/include manifest

Solves #51 and #52