Merge branch 'release/0.3'
Choose license :-]
Merge branch 'master' into develop