Finish setup
Merge pull request #2 from tsili/advanced_setup

Finish setup