some refactoring
Merge branch 'gh-pages' of github.com:walt3rminer/temp_hhba into gh-pages