Merge pull request #696 from balabhv/vb653

Fixed things in iOS