Merge pull request #26 from bglassy/master

fixed section divider conflicts