Merge tag 'v0.10.0'

v0.10.0
Merge commit '1efcfd5bcf92c7f005e1998da92d17d6fe0c61e8'
Merge commit '3c0525550f32676322136057bfd9e17af859d511'
#38 simple JSON api conversion
Merge branch 'master' into develop