Last Fixes
Merge pull request #2 from jefree/last_fixes

Last Fixes