refactoring...
Merge branch 'master' of github.com:lupomontero/horseshoe