Fixed some issues.
Merge branch 'master' of github.com:johntu/MDI-Backpacker