added player support
merge lib