v0.3.2
Merge issues