Code refactoring
Merge branch 'dev_2.1' of https://github.com/rtanklab/WyvernHunter2 into dev_2.1