more init stuff
Merge branch 'master' of https://github.com/jeremiq/jeremiq