Two small bug fixes
Merge branch 'master' into af20

Conflicts:
	AFHARchiver/AFHARchiver.m