Merge pull request #37 from Hasimir/master

Added a thousand suns.
Merge pull request #38 from Hasimir/master

A couple of special options.