Another time update
Merge pull request #8 from svalinn/initial_setup

Another time update