Merge new code from master

Pack detector was added