Merge branch 'release/0.2'

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>