Changes suggested by XCode5
minor changes
Merge commit 'ec5c844dd8a82299559cb6c83beedb30b3dc7cdb'