add code to set pk on instance if primary_key == True
Merge remote-tracking branch 'origin/master'