override setFrame: to allow for change in frame
Merge remote-tracking branch 'origin/master'