[fix] Added support for origin hints. Fixes #10