Merge pull request #201 from raviosc/developer166

Developer166
Changes For Ipade Testing By Self
Merge pull request #202 from raviosc/developer125

Changes For Ipade Testing By Self