Merged with master with new pack detector

Some bugs encountered
NullReferenceException in CDataRender line 226