Player rendering added
Merging to master