added Options class
added Options class
Merge branch 'master' of github.com:pkasarski/oisin