Making things more consistent
Merge branch 'master' of github.com:rigel314/reperire