Options added

Well well.. I finally succeeded to create my first fork and pull request.

I'm sorry there are so many changes in one hit with my fork.
Next time, I'll do it small step by small step.