temp version 0.2+ (fix)
merge