Merge pull request #1 from gentoomaniac/master

My latest changes