release 0.2 (sorted out branches issues)