Version 0.1.8
- move controller setup to separate class