Merge pull request #1 from Deathmax/master

pull latest commits from deathmax