eteran Merge pull request #1 from Kreeblah/master