Feature/fix setup

@brutski Please review and merge.