fyrst commit
Merge https://github.com/als34/HBV1_hopur17