moved init code to setup
Merge pull request #748 from freakypie/master

moved init code to setup