Implement frameskip support (currently set to 0)
Fixed merge conflict.