Add <marker> support
Update github references to use my fork