Change12 - 2
change 34 - 2
Conflict resolved
add 5
Bump version number to 0.2
Oprava 5
Merge branch 'refs/heads/release-0.2'