Dropped in changes for 10.0.09F
Merge pull request #58 from CodeHoarder/master

Changes based on R9F