Refactore and added tests
Refactore and closes #1
Merge branch 'master' of github.com:felipefdl/wgist