Merge pull request #81 from milneti/ChaseBranch

PHP changes, no effect on Android
lots
minor
Merge pull request #82 from milneti/master

Pulling latest from master