Merge pull request #1 from HazCod/master

following upstream