Use options hash for optional client arguments
Align instance variable setters
Merge pull request #16 from anderslime/fix-arg-bug

Fix argument bug