Added features to section 2. Resolves #25