Merge pull request #248 from FrozenNode/dev

Merge 4.3.0 into master