Merge pull request #1 from irungentoo/master

Changes