Setup update

According to #9 
We can talk about it tomorrow :)