branch 0.2
towards version 0.3