Update WIP from wix-devs discussion.
Merge pull request #18 from rseanhall/wip4161

Update WIP from wix-devs discussion