Better deserialisation, general cleanup
Merge branch 'master' of github.com:/poetix/octarine