Added options
Merge pull request #20 from RWOverdijk/feature/config

Added options