Fix diamond block issue
Merge pull request #47 from MFernflower/1.7-update

Fix diamond block issue
Merge pull request #49 from bculkin2442/1.7-update

Resolve compilation issue
Organize class functions
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update