Merge pull request #1 from kha0S/master