Merge branch 'Bug-fix'

Conflicts:
AppDelegate.m
fixes