added EHBO, fixed BHV query, some refactoring
Merge pull request #2 from IISH/test

added EHBO, fixed BHV query, some refactoring