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

some startup changes