Merge pull request #1 from TehGimp/master

Merge in new trunk changes.