Fixed Crash from incorrect IBOutlet
Adding delegate methods
Merge remote-tracking branch 'origin/master'