Updated version
Bump 0.4.4
Fixing conflicts