fix setup function
Merge pull request #48 from papix/fix_setup_function

fix setup function