Merge pull request #15 from mreist/master

Getting MAster
Fixed Option's Class
Merge pull request #16 from mreist/Jay's-Branch

Fixed Option erros