Merge pull request #410 from gavincornwell/master

Integrated latest 1.4 SDK and fixed fallout