version 0.3.0
begin version 0.4-development
Merge branch '0.3'