Last Minute Fixes

Various Last Minute Fixes
Merge pull request #104 from drobbs/master

Last Minute Fixes