Will conflict later.
Merge pull request #2 from jzohrab/wip_conflict_1

Will conflict later.
Resolved conflict.