Merge pull request #2 from doolin/master

Some formatting clean moving towards standard ruby
fix
refactoring
fixed spacing/formatting
fixed Option
updated method and class
spec stuff
Fixed spec