Fetching files from the dev branch...

Figured I'd send this pull request to myself to make sure my fork, for feature-requesting/submission purposes, is as up-to-date as possible...