Fix test
refactor
Simplify ops call
Merge pull request #1 from geek/version3

Refactor