7f68ba
- refactored code to match upsteaem project - backported new features from upsteam version 003-4