Merge pull request #4 from fschaer/newoptions

Newoptions
Merge pull request #5 from fschaer/crons

Crons
Merge remote-tracking branch 'upstream/master'