Merge pull request #181 from Joe0/master

Merge
Merge pull request #182 from Joe0/master

Bug fix, better modding support, new completely implemented storage medium.
Merge pull request #183 from Joe0/master

Pulling updates from downstream.
Update README.md

Minor formatting changes.
Merge remote-tracking branch 'upstream/master'
Fixed formatting issue in README.md