Updating to 0.4.4
merge upstream