Allow custom data to be set
Merge branch 'andamio2' of github.com:jeroencoumans/andamio into andamio2