initial swag at mods for 0.9.4
modifications for 0.9.4
Merge pull request #1 from klehman-rally/dev

dev to master merge for 0.9.4
minor test mods for Windows platform
Merge pull request #12 from klehman-rally/master

from my klehman-rally fork