Fixes init.d start script
Merger remote changes