Closes #14
Merge branch 'master' of https://github.com/BrunoLopezGarcia/Pizarro into enhancement-#14
Merge branch 'enhancement-#14'