#6: Updated docs and includes