Merge pull request #12 from ynotLeft/feature/options

Feature/options