Reviewed work of Martijn and Bas so far
Merge branch 'master' of github.com:martyn82/SST