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

Hi Sven,

Just a pull request so you can keep the github repo up to date with your latest version on monticello by the press of a button.