Close #13, close #23, close #25.
Merge branch 'master' of github.com:adelinosegundo/hi