Merge Snapshots

Any chance of merging the snapshot branch. I've pulled it up to date to work with V4.3 and merged together quite a few changes that have taken place since the branch began.