Feature/sections

Fixed #27 - Merged in #30 because errors.