Closes #14
Merge branch 'master' of github.com:miguelSantirso/one_arrow