Merge pull request #93 from ziggimon/master

Adding restart + delay on startup due to users reporting it starting to ...