Initialise/Shutdown now local
Merge pull request #3 from CookiePLMonster/master

Initialise/Shutdown now local