Change option handling
Merge branch 'master' of https://github.com/arthurmensch/INF555