Remaster merge
Remaster merge
Merge pull request #313 from kmsquire/master

Remaster merge