some minor fixes
Merge branch 'Master' into ios7Dev