Merge pull request #12 from ynotLeft/feature/options

Feature/options
Merge pull request #13 from ynotLeft/develop

Merge pull request #12 from ynotLeft/feature/options