WIP will conflict 2
Resolved conflict.
Merge pull request #3 from jzohrab/wip_conflict_2

WIP will conflict 2