Working master branch

[Ben Hegarty]

Hey guys,

While we wait for the outcome of swellrt is it possible to fix the master 
branch so that it compiles and runs? 

Regards
Ben