fixes #42: seperation of startup hook functionality
Merge branch 'bug/42-seperate-startup-hooks' into dev