Purpose of code changes on this branch:
Fix issues #382 and #384
When reviewing my code changes, please focus on:
https://code.google.com/r/jamesdriscoll71-demo-project-issues
After the review, I'll merge this branch into:
/trunk
Originally reported on Google Code with ID 387
Reported by @JamesDriscoll on 2015-03-10 00:04:49