Merge pull request #276 from FrozenNode/dev

Merging 4.4.0 into master