Sync with main repository (version 1.4 on http://mc.stfx.eu/Neo)
Merge pull request #1 from glassdb/master

Sync with main repository (version 1.4 on http://mc.stfx.eu/Neo)