Merge pull request #1 from evincarofautumn/master

Get up to date with the latest commits.