Merge pull request #1 from jackpal/master

Up from master