Prepare version 0.3.5
Merge branch '0.3'