PQ, Queue and Stack fixed
Set fixed
Set fixed
Merge remote-tracking branch 'upstream/master'