Merge pull request #10 of https://github.com/barnson/wix3 into develop

Conflicts:
	History.md