Made default options more simple.
Merge pull request #1 from Kroogs/optimize

Made default options more simple.