Merge pull request #16 from SignalK/master

Bring through headers etc