some basic startup stuff
Merge pull request #12 from jankroken/master

some startup changes
Merge pull request #13 from aLaserShark/master

Startup changes merge to dev